Code clean-up, update README