Beta - Code cleaning