Additional code cleanup. Added some sample input.