I think that you are being too kind to the original code. I figure that it is more than "fairly dodgy". The idea that the code could be reduced to only 2/3 of original size is a vast understatement!

This is a case where the general implementation approach of the code is just so far wrong, that telling the OP to study more won't help. The OP is trying to modify very poorly written code from another student.

"studying crap" is just going to result in "more crap".

I think this is case where showing some Monk level code is appropriate and I tried to do that. The OP has gotten some enormous hints about what to do.

I hope that the OP uses the code given and comes back with better questions.