{Peter} Code modified to checkstyle standards