Renamed Status class, removed noise