Refactored code to be more simple;  converted all variables to properties and synthesize to auto create getter and setter methods