Commented and cleaned up whitespace