First commit of necessary style changes