Cleanup

Easier to read the code