Add semicolons and cleanup