Cleanup/coupling ff pm exercise

Some changes were made to make solution and exercise more similar (better to compare). E.g. position of some code and comments was adapted.