Rake support + Code cleanup.