Better repositories and PSR-2 formatting