Minor refactoring, remove stick backgrounds