Cleaned up self-closing syntax