Code works, just gotta clean it up