README and scala code cleanup