Code cleanup

Do we need this? Refactor.