Code is now more PSR-1 compilant