More variable declaration & semicolon cleanup