Code simplifictions