Code layout fix