fixed return and semicolons