Move Lock/Unlock into functions per code-review feedback
Move Lock/Unlock into functions per code-review feedback

control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced