Removed space
Reduced if calls from a possible 16 to 1