Cleanup, added properties to config