Style tweaks
Change method names