Remove/fix some @access annotations
Reformatting
Cleanup temp files in tearDown
PSR2 reformatting
PSR2 formatting
PSR2 formatting