Cleaned things up quite a bit