removed aggressive empty checks, employed some format standards