refactor elements in Boundary DefinitionsSigned-off-by: Lukas Harzenetter <lharzenetter@gmx.de> (commit: e40fc62)