Cleaned up my rebase mess