Fixed all line length issues