Improved style with checkstyle. Converted all occurrences of subject into entity.