Changed class & id names

Removed unnecessary comments