Moved user to SingletonClass and cleaned up sauce