Code cleanup / Docs