small code refactoring (removed commented code)