Added visual improvements.
Removed not needed code.