Code cleanup.
Started on assignment 3, made method prototypes.