Cleaned up genconfig