Cleaning up/expanding design notes