[adminchannel] Cleaned up code and fixed missing variables

Signed-off-by: Eldon McGuinness <eldon.mcguinness@gmail.com>