Enforced chronological slot ordering
Cleaned up the declarations