Did some clean up. Going to removing verbose noise from code base