re refactoring. comments. cleanup.