nutty spacing and logic edits