Made tweaks for consistency