clean code, follow conventions
add check for FIELD type default value
Merge branch 'feature/cleanup-layer' into develop