Cleaned some thigns up a bit