Not been together long, about 6 months. Anyway he tends to stay at my house on a weekend and sometimes a couple of nights during the week. When he first started staying over he used to leave his cups and plates on the living room floor, clothes on the toilet after he'd had a shower etc and even crisp packets etc on the sofa. Ive told him over and over again not to do this as I don't like having to clear up after other people. He stops it for a while and then starts it up again. Last weekend he went for a shower and left all his clothes on the toilet again (so obviously the next person to use the toilet has to sort his clothes out first). I was tired and not in the mood so I just swiped them all onto the (wet) floor, used the toilet and left them there. Didn't mention it. When he went in he went mad saying I'd left his clothes on a wet floor!!!! We had yet another conversation about it saying I was sick of picking up his stuff and he still maintained that I was out of order but promised he'd stop doing it. That very same night I found used bog roll (that he'd been blowing his nose with) on the beside table. I told him to move it which he did (whilst calling me master 
) and the next day I found crisp packets stuffed down the side of the sofa so I crammed them all into his coat pocket. Anyway he's buggered off home now and hasn't really been in touch much apart from to say he feels like I was getting at him all weekend and hopes it wouldn't always be like that.
Be honest did I go too far??? How else can I get him to understand?