Changed some comments for clarity purposes