Cleaned up junk code got rid of redundent code