Made more readable format.
Fixed issues