Cleaned up hw01