Changed the name of some variables and did general cleanup