Cleaned up the code and added a couple visual features