improved performance by using lists instead of strings
morning commit, done nothing good but some small tweaks :)