ENH: Address comments, clearer code, get_machid()