Fixed indention, removed commented code