Basic refactor
Basic refactor
Basic refactor
Code refactor