Fixes in code layout