Cleaned for the stencil9
more code cleanup