More code cleanup

Initial variable declaration made more friendly for inexperienced
developers