All cleaned up! (mostly xD)