rename
cleaning up
refactor get data from storage
cleaning up
extract logic into a specific view
extract logic into a specific view