make safer / cleaner