joined all assignments into one file and small cleanup