Declutting initial version.