Code cleanup and shit.

Signed-off-by: null000 <gorha032@umn.edu>