Cleanup: Work on config and logger