Code clean-up and a README