Added visual improvements and code cleanup.