Removed special 'else if' handling. this is redundant since these are simplified.