refactoring and javadoc cleanup
removing s_name field, since it seems to be never set anywere - not sure what it is meant for