refactored. removed useless methods