OnCreate method needs to be cleaned

[RobRuwe]

On create method is huge, we can clean up redundancy and move some of those statements