Minor improvements (code cleaning, etc.)