Added missing line and cleanup