added sensu checks and cleaned up