Refactor of instructions and Angular app