Refactor make script
Update sketches