Various code style fixes
Fix uses of deprecated stuff
Refactoring
Fix hint issues due to missing alt attribute
Merge pull request #302 from boris-petrov/code-style

Code style