Better :derpl: + code cleanup