Improved print.grammar and code style