IMPROVED: removed empty line and white-space at EOL