Remove commented code, add comments for mask, replaced tab indentation to spaces indentation