+ comments and code formatting