Some code cleanup

Added some hidden registers