Cleaning up the code to reflect the manual.