Removed unused variables and not necessary semicolons