Clean up semicolons + white spaces