Removed debugging

Also changed a if statement to a ternary statement.