Cleaned up formatting and removed commented code.