Slight cleanup/barebones cleaning about.

:3