Code refactor suggestions
More code cleaning