switched a more stable solution
minor cleanup