Thanks Teodor!
At the same time would it be worth combing any fixes with the following 'tidy up' suggestion?