some little fixes to clean code a bit