PSR-2 formatting and small updates