Clean up comments
Change to use theme_user_picture