Feature/stze/minor cleanup

minor clean up due to inspections