Prettifying. Removed redundant conditionals. Fixed formatting.