Requested Code Review

I made things shorter, in any case. :)