cleaned up minor conditional