Refactoring and cleanup. Canceling string fields isn't working properly yet