made some new changes to clean things up and to make it neat