drying up code
remove comments