Remove update output and refactoring