Some refactoring and commenting