Formatting , Fixed Naming and Build Spaces