PSR-2 formatting and removal of unnecessary use statements