Some cleanup

considering I have it in a separate folder...