Moved some lines to common