1. Removed class member variables, functions not required outside and made them local to the file