Did some code touch ups and revamps to my liking