Minor cleanup: Set dropdown, merged some functions