Some code changes to closer resemble a PSR-2 compliant codebase