Added comments and stylistic