cleaned up style/ format