cleaned up devise pt II