Cleaned up conditional