Rename skip to control

+ style refactor