Better organization and more code