Kinda sorta cleaned up