Cleanup and moving stuff to config