removed a stray parameter
removed empty if statement
removed the duplicate conditionals