Improve comments and add @current_user global