Code refactoring
Code tweaks