props: code cleanup and tweaks