Dev Stream: Cleaning up the Code