bit more organizing