Cleaned up syntax of some conditionals.