Improved the first assignment based on the reviews
Improving the second exercise