Refactor

wow. such flog.