edited for consistency and standards conformance