Refactored code, refined appearance.