Cleaned up declarations based on review. Changed log to use LOG_PREFIX on each LOG_TAG.