Cleaned up whitespace and removed unused variables