Cleanup

Cleaning up for easier reading