Pr/1

Applied all teacher tips.