Removed some cosmetic changes I made in my branch