Remove whitespace
Removed duplicate code