removed conditionals from output