a.heider: Address PR comments and clean up. Signed-off-by: Rene Treffer <treffer+github@measite.de> Signed-off-by: Andre Heider <a.heider@gmail.com>