Improve readability and simplify

Use longer variable names
Refactor dict comprehension into function with descriptive name
Remove the Profile "update" functionality and rename functions to
reflect this