Changes, refactors and more code