Cleanups + lint + job run()