Refined one line.
Code prettify.
Refactor: Change to UI and behavior. Not done yet.
Refactoring. Still not done yet.
Still refactoring
Refactor mainly done