Removed commented out code, updated styles