whitespace fixes
smarter algo to lift enters