Some slight clean up... It's still ugly, but there's still work to be
done :)