Internal changes. Makes future modifications easier by removing seemingly duplicate code.