Performed recommended tweaks