Jank on jank on jank
some cleanup