Further commenting + neatening code