Cleaned up some mess left over from playing around