cleaned assignment 1 and 2 further