More Clean Up

This code is going to be sooooo clean now!