singleton refactoring, format/organize of imports