cleaned up profile controller + further simplifications