Cleanup and add UIImage utils