fixing typos and cleanup