- just some cleanup so I can actually work on this