cleaned up / commented parts for update