Updated to baelfire 0.2.2 and cleaned code.