Organized + small fix