clean uhc code and fix spacing errors