refactored and cleaned up code a bit more