improved formatting more