fixed usages

now it should be cleaner and more object-oriented