refactored some styles
done some more refactoring