Code cleanup, slightly less strict format requirements