made more modular
cosmetic fixes