Added == and != operators, cleaned code