Update readme & code clenaup.