Various coding style improvements
Separate some code for importing projects