Uncommitted changes, nothing major, some minor refactoring