Added config and cleaned up