Cleaned up info code