Work in progress commit: Adding documentation annotations and minor refactoring.