Refactor after running kibit