I feel like this pull has some code formatting and style inconsistencies. Are you looking for feedback on those sorts of issues?