Formatting consistency
Modularize project