Removed useless semicolons and bug fixe