Cleaned up indentation and unused variables