making application less groovy so it is more similar to the java version
getting 100% test coverage