small tweaks and underscore added
cleaned up code and added underscore