notes + some cleanup