Cleaned up Visual Display and Removed some Redundant code