Polish

This patch set is a preparation for initial linux contribution.