Overall cleanup / Fix inspector warnings