cleaned up hw6