Code Reveiw for Spaces and New Lines
Fix some bugs because of Naming Convension