Cleaned up Devise forms