cleanup rogue.h
cleanup and renames
cleanup