Commented out a lot of used code
Decreased scope of stuff