Refactored shuck server