Code Cleanup

Easier to read code