RFT - @erikr sugestions, import order and class name refs #33