cleaned up _s class conflicts