Refactored projects, minor style tweaks