First commit to improve repo's code