Fixed style warnings, commented out double implementations (to be fixed)