Fix defects from review and fix profile tab
Wrapped module-level functions inside Utils