changed module & class name
made variables internal