Pretty formatiing moved to client
Merged master