faster returns; whitespace fixes