Begin cleanup and documentation. #23