fixed naming style, removed unused functions