Tidying and migrating to knockout