Revert "Aligning various tags"

This reverts commit 6e08f8899f3c79d463187a4444b97f00f70b5eb9.