Refactoring, code align etc.
Updated close method - removed iterator.