Fixed naming and code comments