Code layout corrected