rename singleton
whitespace