Update readme, refactor controller