Removed ugly __ prefixes, since those are not needed