fixed formattig issues