Startet some refac