Fixed prompt "alignment"
Fixed repository bug
Some code clean-up
Rearranged comments