Cleanup

Better code readability