Removed not used comments/code, show line numbers