Code cleanup + checks + started assignment2