Cleanup and organization - wip