In class tweaks