Update readme & code cleanup