Code style

Fix white space and semicolon usage