Second submission - cleanup