Finished some cosmetic adjustments on Challenge 2