Cleanup

merging branches, i like the cleanup