Improved code format - Removed unused variables and not necessary semicolons