Code cleanup from the previous commit (which I made on my laptop, managing 22 files is hard)