Spaces removed
Warnings fixed
Code improved