Isosceles, cleaned up code a bit