More Javadoc and comments
Renamed an inner class and an inner interface in ActiveGlobalSetup