Code cleanup, add comments
Update readme