Minor improvements (Change codebase)