Fix and clean up a few things
Could it be this simple