cleaned and fixed the horrors of previous commit