Minor Code-Design adjustments