Cleaned up all files

Standardised code