Fix styling, improve method names