modified scope of a class
renamed a method
fixed #2