Refactoring

Fixed indentation and removed some commented code.