cleanup and streamlining

removed some unneeded global constants, and improved the admin column
definition