#136 cleaning up the code
#136 clean up
#136 fixed definition