Conditions are now more efficient.
Code cleanup.