Cleanup and addition of Knockout