sttyl: (working checkpoint commit) refactor + comments