Code cleanup and renamed methods to make more sense