Small code refactoring
Small code refactoring
Small code refactoring
Small code refactoring
Further refactoring, removing comments