Adjust spacing, remove some warnings and unused imports
Starting rebuild