Make this prettier