fixed: clean up methods + slight refactoring