Code cleanup

White spacing
Removed unnecessary if