Code consistency and start on create layer