cleanup
add validation to layer naming