Some refactoring inspired by Cheese version 3.6.0, help clears where caps are being set