Refactored code to be more standing. Including yoda conditions, more space between statements and correct file/variable/class names.