[chirp_devel] [PATCH] [TK-270] Refactor for simplicity and readability. #4731