better flow for performance
tiny tweaks