Big refactoring / Clean up v2