bashrc: reorganize file

* reorganize file
* remove commented sections