Little bit of refactoring, and removed some commented code