Cleaned up a lot of things and make everything generally look better