Some compliance changes to new standards
Switched to new formatting standards (uploading config soon)