Fixed public underscores, removed override's