refactored things a little