Tighten code for pick command parsing and db loading