Gave statements an overhaul