Extracted method and got rid of instance variable
Extracted methods and cleaned up code