#99 Cleaning up a bit and added comments