Cleanup of code to make behavior changes more clear in class structure