Organized some Code

removed some unnecessary leftover stuff and organized other bits.