shuttle: update styles and minor refactoring