Code cleaning refactor