Minor whitespace adjustment
Add missing semi-colons
Add whitespace