fixed some coding styles
more fixes and .landscape.yaml added
further fixes
fixed imports
Merge pull request #3026 from digi604/fix-errors

Fix lanscape errors