Looks good! Compact is good, but more importantly I think it's a bit easier to follow. Will merge shortly.