refactored and small style changes