whitespace improvements and cut off too long lone