cleaned up more check functions