Start refactoring
Clean and comment some old stuff