#10 Refactor PIN setting