Added Class Shop, Cleanup