Better organization in code