Cleaned up non-loop thingies