Refactored to adhere to style guidelines/
.