improving efficiency and readability revise and condense