re-format to airbnb and PSR-2 style guidelines