Aw who'm I kidding - nothing's ever "finished.."

Made the code more DRY & cleaned up some mistakes from before.