removed trailing whitespaces, and some layout issues