Mostly documentation with little refactoring