Cleanup

Cleanup code make more hacking friendly and add a comment