Refactor & fix issues