Minor changes

Done removing unnecessary code and renaming