Did some reorganization for assignment 1