Maintenance
 - code cleanup