[PATCH] Move related code next to each other