Clean up + Comments
fixed typo