Project cleanup
Test cleanup: added pragma marks to help navigation