Cleaned up logic for conditional statements.  If/else if/else blocks are now implemented.