Formatting to PSR & added Docblocs