Better module alignment