Code improvement
More code improvement!