Checkstyle compliance and warning removal for Environment package.