Cleaned up a lot of code (mostly visual)