made stylistic changes as per-request from kyle