Refactoring and documentation improvements

dead comment?