More refactoring and added the labels