Commented some code blocks