added line for clarity between loop and return
Added conditional expressions check to style checking.  Closes #20