Cleaned up the just a little bit