Fixed '&&' vs '&' in boolean statement. 
+ Comments and formatting.