major cleanup :)